From a7ec7206f2d13adcbcc648874b13865f520b277b Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sat, 6 Jul 2013 23:21:32 +0000 Subject: [PATCH] Remove (most of) the autoformat overrides in the KML writer and fix our reference files to match these lovely examples of whitespace purity. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4404 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/kml.cc | 10 --- gpsbabel/reference/earth-gc.kml | 150 +++++++++++++++++++++++--------- 2 files changed, 109 insertions(+), 51 deletions(-) diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc index 059ced518..fc6ff8af3 100644 --- a/gpsbabel/kml.cc +++ b/gpsbabel/kml.cc @@ -1084,7 +1084,6 @@ void kml_gc_make_balloonstyletext(void) QString cdataStr; writer->writeStartElement("BalloonStyle"); - AUTOFORMATTING_OFF(af); // FIXME: we turn off autoformatting just to match old writer test references. writer->writeStartElement("text"); cdataStr.append("\n"); @@ -1149,7 +1148,6 @@ void kml_gc_make_balloonstyletext(void) writer->writeCDATA(cdataStr); writer->writeEndElement(); // Close text tag writer->writeEndElement(); // Close BalloonStyle tag - AUTOFORMATTING_RESTORE(af); } static @@ -1395,42 +1393,34 @@ static void kml_write_data_element(const char* name, const QString& value) { writer->writeStartElement("Data"); writer->writeAttribute("name", name); - AUTOFORMATTING_OFF(af); // FIXME: we turn off autoformatting just to match old writer test references. writer->writeTextElement("value", value); writer->writeEndElement(); // Close Data tag - AUTOFORMATTING_RESTORE(af); } static void kml_write_data_element(const char* name, const int value) { writer->writeStartElement("Data"); writer->writeAttribute("name", name); - AUTOFORMATTING_OFF(af); // FIXME: we turn off autoformatting just to match old writer test references. writer->writeTextElement("value", QString::number(value)); writer->writeEndElement(); // Close Data tag - AUTOFORMATTING_RESTORE(af); } static void kml_write_data_element(const char* name, const double value) { writer->writeStartElement("Data"); writer->writeAttribute("name", name); - AUTOFORMATTING_OFF(af); // FIXME: we turn off autoformatting just to match old writer test references. writer->writeTextElement("value", QString::number(value, 'f', 6)); writer->writeEndElement(); // Close Data tag - AUTOFORMATTING_RESTORE(af); } static void kml_write_cdata_element(const char* name, const QString& value) { writer->writeStartElement("Data"); writer->writeAttribute("name", name); - AUTOFORMATTING_OFF(af); // FIXME: we turn off autoformatting just to match old writer test references. writer->writeStartElement("value"); writer->writeCDATA(value); writer->writeEndElement(); // Close value tag writer->writeEndElement(); // Close Data tag - AUTOFORMATTING_RESTORE(af); } static void kml_geocache_pr(const waypoint* waypointp) diff --git a/gpsbabel/reference/earth-gc.kml b/gpsbabel/reference/earth-gc.kml index ebeb302d5..b2f5c92c2 100644 --- a/gpsbabel/reference/earth-gc.kml +++ b/gpsbabel/reference/earth-gc.kml @@ -45,7 +45,8 @@ 0 - + @@ -122,7 +123,8 @@ - ]]> +]]> + @@ -236,22 +240,51 @@ - GC7FA4 - Points géodésiques du Québec - Sverdrup2 - 6293 - 15-Aug-2002 - stars1 - stars1 - virtual - - 46.133333 - -73.000000 - Locationless (Reverse) Cache - http://www.geocaching.com/images/kml/8.png - - + GC7FA4 + + + Points géodésiques du Québec + + + Sverdrup2 + + + 6293 + + + 15-Aug-2002 + + + stars1 + + + stars1 + + + virtual + + + + + + 46.133333 + + + -73.000000 + + + Locationless (Reverse) Cache + + + http://www.geocaching.com/images/kml/8.png + + + + + + Pour inscrire votre découverte, vous devez prendre en note le NUMÉRO DU POINT(inscrit sur le point même ou au centre du panneau)LA COORDONNÉE(en format HDDD MM.MM WGS84 datum ET UTM NAD83 indiquer la zone SVP)et L'ALTITUDE RELATIVE. Si le points n'est pas visible (il se peut qu'il soit sous quelques centimètres de terre) vous pouvez prendre la coordonnée à l'emplacement du panneau SI LA PRÉCISION DE VOTRE GPS EST SUPÉRIEUR À LA DISTANCE INSCRITE SUR LE PANNEAU (ex : Précison du GPS de 5m et distance au point inscrite sur le panneau de 3m).

@@ -285,8 +318,10 @@ And all old names of ministries and/or organization

PICTURES of points and of the panels will follow soon. YOU CAN ONLY LOG ONE POINT (ONE POINT PER GEOCACHER) -Good luck!]]> - Found it by Christopher R & Pooh B 2005-07-12
This marker is not in Quebec but it is a Geodesic marker in Clarenville, Newfoundland, Canada! +Good luck!]]> + + + Found it by Christopher R & Pooh B 2005-07-12
This marker is not in Quebec but it is a Geodesic marker in Clarenville, Newfoundland, Canada! Found this one while hunting a traditional cache and thought of this cache right away! @@ -328,7 +363,8 @@ Judging by the coordinates it looks like the coords should be 45°29'31.5"

Found it by Gps_Gulliver&DauphinBleu 2005-05-29
Point Geodesique situe near Port de Plaisance de Longueuil sur le bord du fleuve st-laurent. Il y a des sentiers et une grande piste cyclable -Enjoy !

]]> +Enjoy !

]]> + -73.000000,46.133333 @@ -348,21 +384,50 @@ Enjoy !

]]> - GCGCA8 - Oozy rat in a sanitary zoo - robertlipe - 32733 - 29-Jun-2003 - stars3 - stars2 - not_chosen - - 35.921667 - -86.861667 - Unknown Cache - http://www.geocaching.com/images/kml/8.png - - + GCGCA8 + + + Oozy rat in a sanitary zoo + + + robertlipe + + + 32733 + + + 29-Jun-2003 + + + stars3 + + + stars2 + + + not_chosen + + + + + + 35.921667 + + + -86.861667 + + + Unknown Cache + + + http://www.geocaching.com/images/kml/8.png + + + + + + @@ -377,9 +442,12 @@ Enjoy !

]]> Now that it's intuitively obvious to even the most casual observer where the cache is, turn on your geo-mojo and go find it.
-Member of Middle Tennessee GeoCachers Club [www.mtgc.org]

]]> - Found it by littlepod 2005-07-03
Enjoyed the puzzle. We seemed to be about 50ft off though. TFTC.

Write note by robertlipe 2005-04-29
TB Drop to show he's hanging out in Nashville until we blast off for Geowoodstock in a few weeks.

Found it by Big Bumblebee 2005-04-18
Found it a while ago. Thanks.

Write note by robertlipe 2005-03-27
I had to renew my permit with the CDC and in doing so, I trolled out here verified that the infectious ooze is fully within specification and industry accepted tolerance. Ooze On!

Found it by Virtual Babe 2004-12-27
This was a great cache, however on this day I considered it a FIFM cache (Fun, Invigorating, Frustrating and Maddening), especially when the cache was not replaced in the proper spot by the previous cacher! Thanks anyway!! -

Write note by robertlipe 2004-01-12
I got a complaint from the CDC about oozy rat this weekend. I went out tonight in the dark and verified that the infectious ooze is fully within specification and industry accepted tolerance. (Although I realize now I did misstate the cache container to the reporting officer when confronted. It's, uuuuh, smaller than I said.)

Write note by robertlipe 2003-10-04
In the expectation that this cache will get some traffic in the next 48 hours, Ryan and I checked it earlier today. The Rat is Oozing just as we planned it.

Write note by robertlipe 2003-07-03
It won't earn him a smiley face, but I've confirmed that rickrich would have indeed sunk the battleship! Thanx for playing. You get a copy of the home game and some rice-a-roni...

]]> +Member of Middle Tennessee GeoCachers Club [www.mtgc.org]

]]> + + + Found it by littlepod 2005-07-03
Enjoyed the puzzle. We seemed to be about 50ft off though. TFTC.

Write note by robertlipe 2005-04-29
TB Drop to show he's hanging out in Nashville until we blast off for Geowoodstock in a few weeks.

Found it by Big Bumblebee 2005-04-18
Found it a while ago. Thanks.

Write note by robertlipe 2005-03-27
I had to renew my permit with the CDC and in doing so, I trolled out here verified that the infectious ooze is fully within specification and industry accepted tolerance. Ooze On!

Found it by Virtual Babe 2004-12-27
This was a great cache, however on this day I considered it a FIFM cache (Fun, Invigorating, Frustrating and Maddening), especially when the cache was not replaced in the proper spot by the previous cacher! Thanks anyway!! +

Write note by robertlipe 2004-01-12
I got a complaint from the CDC about oozy rat this weekend. I went out tonight in the dark and verified that the infectious ooze is fully within specification and industry accepted tolerance. (Although I realize now I did misstate the cache container to the reporting officer when confronted. It's, uuuuh, smaller than I said.)

Write note by robertlipe 2003-10-04
In the expectation that this cache will get some traffic in the next 48 hours, Ryan and I checked it earlier today. The Rat is Oozing just as we planned it.

Write note by robertlipe 2003-07-03
It won't earn him a smiley face, but I've confirmed that rickrich would have indeed sunk the battleship! Thanx for playing. You get a copy of the home game and some rice-a-roni...

]]> + -86.861667,35.921667 -- 2.30.2